From: Ross Lagerwall Date: Fri, 20 Jun 2014 08:37:21 +0000 (+0200) Subject: x86/mwait_idle: fix trace output X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4810 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=d17ac1d5433ba2c25d7fab11baba59173e339896;p=xen.git x86/mwait_idle: fix trace output Use the C-state's type when tracing, not its index since the index is not set by the mwait_idle driver. Signed-off-by: Ross Lagerwall --- diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 72a7abff4f..38172e5b64 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -376,7 +376,7 @@ static void mwait_idle(void) lapic_timer_off(); before = cpuidle_get_tick(); - TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, before, exp, pred); + TRACE_4D(TRC_PM_IDLE_ENTRY, cx->type, before, exp, pred); if (cpu_is_haltable(cpu)) mwait_idle_with_hints(eax, MWAIT_ECX_INTERRUPT_BREAK); @@ -385,7 +385,7 @@ static void mwait_idle(void) cstate_restore_tsc(); trace_exit_reason(irq_traced); - TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, after, + TRACE_6D(TRC_PM_IDLE_EXIT, cx->type, after, irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); update_idle_stats(power, cx, before, after);